From 4492978d319360ca6804a69130d6793b9399f458 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Jul 2006 20:22:35 +0000 Subject: [PATCH] Update requirements --- ChangeLog | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- configure.in | 10 +++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 828ad77fa6..2db19ebdbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ -2006-06-30 Matthias Clasen +2006-07-02 Matthias Clasen + + * configure.in: Require cairo 1.2 and GLib 2.12, + set version to 2.10 +2006-06-30 Matthias Clasen + * gtk/gtknotebook.c (gtk_notebook_tab_space): Remove redundant assignments to page, which may cause NULL dereferences. (#346334, Dave Vasilevsky) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 828ad77fa6..2db19ebdbe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ -2006-06-30 Matthias Clasen +2006-07-02 Matthias Clasen + + * configure.in: Require cairo 1.2 and GLib 2.12, + set version to 2.10 +2006-06-30 Matthias Clasen + * gtk/gtknotebook.c (gtk_notebook_tab_space): Remove redundant assignments to page, which may cause NULL dereferences. (#346334, Dave Vasilevsky) diff --git a/configure.in b/configure.in index 1c57a86b74..16f6479367 100644 --- a/configure.in +++ b/configure.in @@ -11,11 +11,11 @@ AC_PREREQ(2.54) # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. m4_define([gtk_major_version], [2]) -m4_define([gtk_minor_version], [9]) -m4_define([gtk_micro_version], [5]) +m4_define([gtk_minor_version], [10]) +m4_define([gtk_micro_version], [0]) m4_define([gtk_version], [gtk_major_version.gtk_minor_version.gtk_micro_version]) -m4_define([gtk_interface_age], [2]) +m4_define([gtk_interface_age], [0]) m4_define([gtk_binary_age], [m4_eval(100 * gtk_minor_version + gtk_micro_version)]) # This is the X.Y used in -lgtk-FOO-X.Y @@ -31,10 +31,10 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.10.0]) # required versions of other packages -m4_define([glib_required_version], [2.11.4]) +m4_define([glib_required_version], [2.12.0]) m4_define([pango_required_version], [1.13.0]) m4_define([atk_required_version], [1.9.0]) -m4_define([cairo_required_version], [1.1.8]) +m4_define([cairo_required_version], [1.2.0]) AC_INIT([gtk+], [gtk_version], -- 2.30.2